From: Jiafei Pan <Jiafei.Pan@nxp.com>
Date: Wed, 11 Apr 2018 12:12:24 +0000 (+0000)
Subject: layerscape: fix integer handling issues
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=f7c5f30799a2c2431f1fccd5c79229492629e0ec;p=project%2Fbcm63xx%2Fatf.git

layerscape: fix integer handling issues

Assert before actually using.

Signed-off-by: Jiafei Pan <Jiafei.Pan@nxp.com>
---

diff --git a/plat/layerscape/board/ls1043/ls1043_psci.c b/plat/layerscape/board/ls1043/ls1043_psci.c
index a41e79e5..1c83df43 100644
--- a/plat/layerscape/board/ls1043/ls1043_psci.c
+++ b/plat/layerscape/board/ls1043/ls1043_psci.c
@@ -94,10 +94,10 @@ static void __dead2 ls1043_system_reset(void)
 static int ls1043_pwr_domain_on(u_register_t mpidr)
 {
 	int core_pos = plat_core_pos_by_mpidr(mpidr);
-	uint32_t core_mask = 1 << core_pos;
-	uint32_t brr;
+	uint32_t core_mask, brr;
 
 	assert(core_pos >= 0 && core_pos < PLATFORM_CORE_COUNT);
+	core_mask = 1 << core_pos;
 
 	/* set warm boot entry */
 	mmio_write_32(LS_SCFG_BASE + LS_SCFG_SCRATCHRW0_OFFSET,